Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add options to defaultGetInitialProps and upgrade styled-jsx-with-csp example #32594

Merged
merged 6 commits into from
Dec 17, 2021
Merged

Add options to defaultGetInitialProps and upgrade styled-jsx-with-csp example #32594

merged 6 commits into from
Dec 17, 2021

Conversation

huozhi
Copy link
Member

@huozhi huozhi commented Dec 17, 2021 •
edited
Loading

x-ref: vercel/styled-jsx#763

  • Add 2nd arg options to docCtx.defaultGetInitialProps to make customization easier
  • Upgrade styled-jsx to fit typing
  • Update styled-jsx csp example

@ijjk ijjk added examples Issue/PR related to examples created-by: Next.js team PRs by the Next.js team. labels Dec 17, 2021
@huozhi huozhi mentioned this pull request Dec 17, 2021
Closed
@huozhi huozhi marked this pull request as draft December 17, 2021 01:38
@huozhi huozhi marked this pull request as ready for review December 17, 2021 01:40
leerob
leerob previously approved these changes Dec 17, 2021
View reviewed changes
@huozhi huozhi requested a review from leerob December 17, 2021 10:20
@huozhi huozhi force-pushed the example/upgrade-styled-jsx-with-csp branch from a6cc18f to 7484ada Compare December 17, 2021 20:23
@huozhi huozhi changed the title Example: upgrade styled-jsx-with-csp with latest styled-jsx Add options to defaultGetInitialProps and upgrade styled-jsx-with-csp example Dec 17, 2021
@huozhi huozhi requested a review from ijjk December 17, 2021 20:28
@ijjk

This comment has been minimized.

Sign in to view
@huozhi huozhi mentioned this pull request Dec 17, 2021
Merged
@huozhi huozhi force-pushed the example/upgrade-styled-jsx-with-csp branch from 58130a0 to 889dcb7 Compare December 17, 2021 21:55
@huozhi huozhi requested a review from ijjk December 17, 2021 22:10
@ijjk

This comment has been minimized.

Sign in to view
@ijjk

This comment has been minimized.

Sign in to view
@ijjk
Copy link
Member

ijjk commented Dec 17, 2021

Stats from current PR

Default Build (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
buildDuration 17.4s 17.5s ⚠️ +98ms
buildDurationCached 3.2s 3.3s ⚠️ +25ms
nodeModulesSize 348 MB 348 MB ⚠️ +161 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.714 2.755 ⚠️ +0.04
/ avg req/sec 921.32 907.28 ⚠️ -14.04
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.127 1.279 ⚠️ +0.15
/error-in-render avg req/sec 2217.46 1954.61 ⚠️ -262.85
Client Bundles (main, webpack, commons) Overall decrease ✓
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
450.HASH.js gzip 179 B 179 B ✓
framework-HASH.js gzip 42.2 kB 42.2 kB ✓
main-HASH.js gzip 30.2 kB 30.2 kB -2 B
webpack-HASH.js gzip 1.45 kB 1.45 kB ✓
Overall change 74 kB 74 kB -2 B
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
_app-HASH.js gzip 1.37 kB 1.37 kB ✓
_error-HASH.js gzip 194 B 194 B ✓
amp-HASH.js gzip 312 B 312 B ✓
css-HASH.js gzip 326 B 326 B ✓
dynamic-HASH.js gzip 2.37 kB 2.37 kB ✓
head-HASH.js gzip 350 B 350 B ✓
hooks-HASH.js gzip 919 B 919 B ✓
image-HASH.js gzip 4.73 kB 4.73 kB ✓
index-HASH.js gzip 263 B 263 B ✓
link-HASH.js gzip 2.13 kB 2.13 kB ✓
routerDirect..HASH.js gzip 321 B 321 B ✓
script-HASH.js gzip 383 B 383 B ✓
withRouter-HASH.js gzip 318 B 318 B ✓
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 14.1 kB 14.1 kB ✓
Client Build Manifests
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
_buildManifest.js gzip 459 B 459 B ✓
Overall change 459 B 459 B ✓
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
index.html gzip 532 B 532 B ✓
link.html gzip 547 B 545 B -2 B
withRouter.html gzip 526 B 526 B ✓
Overall change 1.6 kB 1.6 kB -2 B

Diffs

Diff for main-HASH.js 
@@ -9707,7 +9707,7 @@ https://github.com/threepointone/glamor/blob/667b480d31b3721a905021b26e1290ce92c
           if (cssString) {
             invariant(
               isString(cssString),
-              "makeStyleTag acceps only strings as second parameter"
+              "makeStyleTag accepts only strings as second parameter"
             );
           }
Diff for index.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-13e6a46a9cadd374.js"
+      src="/_next/static/chunks/main-4a3c6d81854b7639.js"
       defer=""
     ></script>
     <script
Diff for link.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-13e6a46a9cadd374.js"
+      src="/_next/static/chunks/main-4a3c6d81854b7639.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-13e6a46a9cadd374.js"
+      src="/_next/static/chunks/main-4a3c6d81854b7639.js"
       defer=""
     ></script>
     <script
Default Build with SWC (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
buildDuration 19.1s 19.3s ⚠️ +205ms
buildDurationCached 3.3s 3.3s ⚠️ +7ms
nodeModulesSize 348 MB 348 MB ⚠️ +161 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.766 2.829 ⚠️ +0.06
/ avg req/sec 903.91 883.66 ⚠️ -20.25
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.168 1.183 ⚠️ +0.02
/error-in-render avg req/sec 2139.8 2113.96 ⚠️ -25.84
Client Bundles (main, webpack, commons) Overall decrease ✓
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
450.HASH.js gzip 179 B 179 B ✓
framework-HASH.js gzip 42.3 kB 42.3 kB ✓
main-HASH.js gzip 30.3 kB 30.3 kB -1 B
webpack-HASH.js gzip 1.44 kB 1.44 kB ✓
Overall change 74.3 kB 74.3 kB -1 B
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
_app-HASH.js gzip 1.35 kB 1.35 kB ✓
_error-HASH.js gzip 180 B 180 B ✓
amp-HASH.js gzip 305 B 305 B ✓
css-HASH.js gzip 321 B 321 B ✓
dynamic-HASH.js gzip 2.36 kB 2.36 kB ✓
head-HASH.js gzip 342 B 342 B ✓
hooks-HASH.js gzip 906 B 906 B ✓
image-HASH.js gzip 4.75 kB 4.75 kB ✓
index-HASH.js gzip 256 B 256 B ✓
link-HASH.js gzip 2.19 kB 2.19 kB ✓
routerDirect..HASH.js gzip 314 B 314 B ✓
script-HASH.js gzip 375 B 375 B ✓
withRouter-HASH.js gzip 309 B 309 B ✓
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 14.1 kB 14.1 kB ✓
Client Build Manifests
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
_buildManifest.js gzip 459 B 459 B ✓
Overall change 459 B 459 B ✓
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary huozhi/next.js example/upgrade-styled-jsx-with-csp Change
index.html gzip 533 B 532 B -1 B
link.html gzip 546 B 545 B -1 B
withRouter.html gzip 527 B 526 B -1 B
Overall change 1.61 kB 1.6 kB -3 B

Diffs

Diff for main-HASH.js 
@@ -9707,7 +9707,7 @@ https://github.com/threepointone/glamor/blob/667b480d31b3721a905021b26e1290ce92c
           if (cssString) {
             invariant(
               isString(cssString),
-              "makeStyleTag acceps only strings as second parameter"
+              "makeStyleTag accepts only strings as second parameter"
             );
           }
Diff for index.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-13e6a46a9cadd374.js"
+      src="/_next/static/chunks/main-4a3c6d81854b7639.js"
       defer=""
     ></script>
     <script
Diff for link.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-13e6a46a9cadd374.js"
+      src="/_next/static/chunks/main-4a3c6d81854b7639.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-13e6a46a9cadd374.js"
+      src="/_next/static/chunks/main-4a3c6d81854b7639.js"
       defer=""
     ></script>
     <script
Commit: d3db715

@kodiakhq kodiakhq bot merged commit b58a3f0 into vercel:canary Dec 17, 2021
@vercel vercel locked as resolved and limited conversation to collaborators Jan 27, 2022
@huozhi huozhi deleted the example/upgrade-styled-jsx-with-csp branch February 3, 2022 12:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ijjk ijjk ijjk approved these changes

@shuding shuding Awaiting requested review from shuding

@steven-tey steven-tey Awaiting requested review from steven-tey

@timneutkens timneutkens Awaiting requested review from timneutkens

@leerob leerob Awaiting requested review from leerob

Assignees
No one assigned
Labels
created-by: Next.js team PRs by the Next.js team. examples Issue/PR related to examples type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@huozhi @ijjk @leerob